feat: add cross device sync #1005
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I forgot to add the data into the merging logic, So remote always have empty value :(. Better late than never.
Various improvement and added the option to choose what they want to sync. Added sync library button to LibraryTab as well. Signed-off-by: KaiserBh <kaiserbh@proton.me>
|
Opened a PR to upstream mihonapp/mihon#40 so feel free to wait for that to be merged before merging this. |
|
Great! Hopefully it's merged soon |
|
@kaiserbh omg I just saw an issue from seven years ago talking about the need for cloud sync. I didn't expect it to actually exist now. Thank you for your greatful PR |
…o tachiyomi-sy-with-sync
Also changed it to be app specific, we don't want them to use sync data from SY or other forks as some of the model and backup is different. So if people using other forks they should use the same data and not mismatch.
5 tasks
I think we were reaching deadlock or infinite loop causing the sync to go forever.
Using timestamp to sync is a bit skewed due to system clock etc and therefore there was a lot of issues with it such as removing a manga that shouldn't have been removed. Marking chapters as unread even though it was marked as a read. Hopefully by using versioning system it should eliminate those issues.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
|
Hi @jobobby04, I have closed the PR to the upstream I explained it on the discord announcement for the people who are testing it or been using it for the past year ish, anyway, I know the PR is big and I am more than happy to streamline it and divide it to make it smaller. So whenever you got the time can you do initial review of it and let me know the changes I need to make? |
jobobby04
reviewed
Feb 24, 2024
app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt
Outdated
Show resolved
Hide resolved
Signed-off-by: KaiserBh <kaiserbh@proton.me>
We don't need this anymore since we are utilizing versioning system. Signed-off-by: KaiserBh <kaiserbh@proton.me>
I forgot to cherry pick this from mihon branch.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
Signed-off-by: KaiserBh <kaiserbh@proton.me>
Signed-off-by: KaiserBh <kaiserbh@proton.me>
Signed-off-by: KaiserBh <kaiserbh@proton.me>
When there is changes in the chapters table such as reading or updating last read page we should bump the manga version. This way the manga is synced properly as in the History and last_read history is synced properly. This should fix the sorting issue. Signed-off-by: KaiserBh <kaiserbh@proton.me>
Signed-off-by: KaiserBh <kaiserbh@proton.me>
|
I've pushed the latest Mihon commits, looks like conflicts need fixing |
Signed-off-by: KaiserBh <kaiserbh@proton.me>
fixed. |
jobobby04
approved these changes
Mar 16, 2024
Merged
cuong-tran
referenced
this pull request
in komikku-app/komikku
Mar 18, 2024
* feat: add cross device sync. * chore: add google api. * chore: add SY specifics. * feat: add backupSource, backupPref, and "SY" backupSavedSearches. I forgot to add the data into the merging logic, So remote always have empty value :(. Better late than never. * feat(sync): Allow to choose what to sync. Various improvement and added the option to choose what they want to sync. Added sync library button to LibraryTab as well. Signed-off-by: KaiserBh <kaiserbh@proton.me> * oops. Signed-off-by: KaiserBh <kaiserbh@proton.me> * refactor: fix up the sync triggers, and update imports. * refactor * chore: review pointers. * refactor: update imports * refactor: add more error guard for gdrive. Also changed it to be app specific, we don't want them to use sync data from SY or other forks as some of the model and backup is different. So if people using other forks they should use the same data and not mismatch. * fix: conflict and refactor. * refactor: update imports. * chore: fix some of detekt error. * refactor: add breaks and max retries. I think we were reaching deadlock or infinite loop causing the sync to go forever. * feat: db changes to accommodate new syncing logic. Using timestamp to sync is a bit skewed due to system clock etc and therefore there was a lot of issues with it such as removing a manga that shouldn't have been removed. Marking chapters as unread even though it was marked as a read. Hopefully by using versioning system it should eliminate those issues. * chore: add migrations * chore: version and is_syncing fields. * chore: add SY only stuff. * fix: oops wrong index. Signed-off-by: KaiserBh <kaiserbh@proton.me> * chore: review pointers. Signed-off-by: KaiserBh <kaiserbh@proton.me> * chore: remove the option to reset timestamp We don't need this anymore since we are utilizing versioning system. Signed-off-by: KaiserBh <kaiserbh@proton.me> * refactor: Forgot to use the new versioning system. I forgot to cherry pick this from mihon branch. * chore: remove isSyncing from Chapter/Manga model. Signed-off-by: KaiserBh <kaiserbh@proton.me> * chore: remove unused import. Signed-off-by: KaiserBh <kaiserbh@proton.me> * chore: remove isSyncing leftover. Signed-off-by: KaiserBh <kaiserbh@proton.me> * chore: remove isSyncing. Signed-off-by: KaiserBh <kaiserbh@proton.me> * refactor: make sure the manga version is bumped. When there is changes in the chapters table such as reading or updating last read page we should bump the manga version. This way the manga is synced properly as in the History and last_read history is synced properly. This should fix the sorting issue. Signed-off-by: KaiserBh <kaiserbh@proton.me> --------- Signed-off-by: KaiserBh <kaiserbh@proton.me>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This essentially refers to the pull request I submitted at GitHub - Tachiyomi Pull Request #9790. My initial thought was to contribute the pull request to the upstream project, anticipating that it would subsequently be integrated into the downstream, particularly SY, which I predominantly use. However, given the halt in development for the vanilla version, I opted to directly submit the pull request to SY. This PR encompasses numerous modifications; the feature in question has been available for a considerable duration and has undergone thorough testing on the Discord server, with all functionalities operating smoothly.
Currently, there are two services available: Syncyomi, which is self-hosted, and Google Drive.
Once merged you will need to create OAuth 2.0 Client IDs in google console then replace the
app/src/main/assets/client_secrets.jsonOnce all of that is done just need to set the app to
publishinstead oftestingthat way everyone can access it otherwise limited to 100 users we add for testing, we don't need to submit the app for approval since we are not using sensitive scopes. More info hereOAuth Consent Screen
Scopes